Merge branch 'hotfix/1.1.1'
fixed two digit events
Merge branch 'hotfix/1.1.2' into develop