Merge branch 'release/1.0'

* release/1.0:
  some feature
  cool feature done
Merge branch 'master' into develop

* master: