Merge pull request #309 from Alexpux/develop

Some fixes.