Sync source with Java
Merge pull request #6 from infosia/sync_cpplatest

Sync source with Java