Relsease Version 1.0
Merge branch 'release' into dev
dev version