Merge pull request #52 from ruphy/develop

Align develop branch to latest fixes on master