Merge branch 'hotfix/103'
formulae
Merge branch 'master' into develop