Merge pull request #95 from rampo/develop

Fixed #93 in master
Releasing 2.1.2
Merge pull request #96 from rampo/master

2.1.2 in dev