hotfix.1.0.1

Bug fixes and enhancements.


Fixes #24
Fixes #25 
Fixes #27