Merge pull request #7 from snikk/sdk_1.2.1

Sdk 1.2.1 updates
Merge remote-tracking branch 'origin/sdk_1.2.1' into sdk-1.2