Fixed #24
Fixed #27
Release 1.2.1 - Bugs fixed
Merge pull request #28 from rampo/bugfix

Merging release 1.2.1 - Bugs Fixed