Merge branch 'release-1.0'
hot fixes, increase vesrion number
Merge branch 'hotfix-1.2' into development