Merge branch 'Development'
version 1.1 #release
Merge branch 'master' into Development