See Issue #106
Merge pull request #103 from Kanti/master

small fixes by @Kanti
Merge pull request #107 from Kanti/patch-1

See Issue #106 by @Kanti
Merge pull request #8 from danpros/master

Update to master