Merge pull request #153 from msaeedi/master

MOBSDK-521
MOBSDK-591: minor update