Fix
Merge pull request #39 from ryanshawty/dev

Fix