Hopefully fixed bug #7
Merge pull request #8 from leolabs/development

Fixing bug #7 and some minor improvements