Fix of #1 and #2

Upgrade the version from 0.1.1 to 0.1.2 with two fixes #1 and #2