Fixed a few a few things
Merge pull request #20 from ryanatty/develop

Fixed a few a few things