Merge pull request #16 from andrewhumelind/master

andrew's work is awesome, and acceptable.
voiced opinions