Merge pull request #1 from nuovo/master

Bugfixes
Bugfixes, version number bump
Bugfixes, version number bump
Merge pull request #32 from pilsetnieks/master

Bugfixes, version number bump