Merge pull request #8 from NinjaBanjo/develop

Merging in some bug fixes