Merge pull request #143 from Alexpux/develop

Some fixes.