Ported to SDK 2.0

latest commit 4f5d0beb0f
@cktben authored