Fixes bug 'rozo expand' #50
Merge branch 'hotfix/1.2.4' into develop
merge hotfix 1.2.4 into develop