Fix #1
Merge branch 'hotfix/1.2.4'