Merge branch 'release/1.0.1' into develop

* release/1.0.1:
  Apply a bug fix
Remove extra stuff
fix a bug!
Merge branch 'release/1.1.0'

* release/1.1.0:
  fix a bug!
  Remove extra stuff