Merge pull request #28 from kevmoo/master

Updates for SDK 0.6.9+