Update to SDK 2

latest commit 19ae79a526
@jackcannon authored