Merge branch 'release/1.0.2' into develop

* release/1.0.2:
  update version
add define methods
update version
Merge branch 'release/1.1.0'

* release/1.1.0:
  update version
  add define methods