Merge pull request #6 from andrewmichaud/master

fixstuff
Merge pull request #7 from andrewmichaud/develop

Merge pull request #6 from andrewmichaud/master