various fixes

- fixes #37
- fixes #38
- fixes #39

- additionally version number corrected.
Merge pull request #40 from hrajotia/develop

various fixes