fixes for latest SDK
Merge pull request #101 from kevmoo/master

all shiny and worky for 0.5.16