Fixed issue #28
Fixed issue #27
Preparing for v0.2.0 release