Merge pull request #140 from Alexpux/develop

 Cherry pick from master