small fixes of SDK
Merge branch 'master' into nodeJS