Some fixes for latest SDK, readying for 1.0
Merge pull request #39 from Scarygami/master

Some fixes for latest SDK, readying for 1.0