1.0 initial commit
Merge branch '1.0'

* 1.0:
  1.0 initial commit