Merge pull request #214 from Alexpux/develop

Small changes