Merge pull request #347 from Alexpux/develop

Various fixes