Merge pull request #223 from gavincornwell/master

More SDK cleanup
SDK Samples updates following recent SDK changes
Merge pull request #224 from mikeh/master

SDK Samples updates following recent SDK changes