Merge pull request #423 from s0undt3ch/develop

Misc fixes
Bump version.