Merge pull request #23 from ColeTownsend/master

Master
sweet.
ship
ship
Merge branch 'dev'