Working on testing
Fixes #27
Fixing #23, #22, #21
Version bump
Merge pull request #29 from ianwalter/development

Fixing issues