Merge pull request #127 from Alexpux/develop

Small modifications