MOBILE-1355
MOBSDK-513
Merge pull request #28 from jmpascal/master

Sprint 2 Bug fixes