Merge pull request #190 from Alexpux/develop

Updates
Merge commit '076ebe29842e92140e98a1af636a3b702b7f5dfa' into develop