Merge pull request #188 from Alexpux/develop

Updates