Fixes #3, fixes #22 - thanks @Kazo!
Merge pull request #25 from codemonkey85/dev

Fixes #3, fixes #22 - thanks @Kazo!