I think this resolves #19
Fixes #25
Merge pull request #26 from NickGeek/development

Bug fixes