Merge pull request #168 from Alexpux/develop

Fix for previous commit