Merge pull request #194 from Alexpux/develop

Updates