fix bug for release 1.0
Merge branch 'release/Release1.0'

we are done with the release 1.0 and merge back to master for production