Merge pull request #184 from mikeh/master

Reworked MOBSDK-615