Merge pull request #42 from DanielReid/develop

Bugfixes