Merge pull request #19 from SaveTheRbtz/master

Fixes for bugs reported by agodin@
v0.19.2