synced with sdk v1.9.0
Merge pull request #6 from ryannedolan/master

synced with sdk v1.9.0