Merge branch 'hotfix/1.1'
Bump version
Enhanced xxxteen display
Merge branch 'hotfix/1.2' into develop