Merge pull request #207 from gavincornwell/master

MOBSDK-636 & MOBSDK-640