Merge pull request #193 from Alexpux/develop

Some fixes