Version 1.0
Updated description
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Version 1.0