Integrated latest version of SDK
Merge pull request #416 from gavincornwell/master

Integrated latest version of SDK