Add version 2.0 code
Merge branch 'dev-chin' into development