Merge pull request #70 from blakefrantz/master