Merge branch 'release/1.0.0'
changes for master