Merge pull request #188 from msaeedi/master

MOBSDK-620