Merge branch 'release/1.0.1'

* release/1.0.1:
  support 1.0.1
support 1.1.0
Merge branch 'hotfix/1.1.0' into develop

* hotfix/1.1.0:
  support 1.1.0