Fix #40
Merge branch 'develop' into issue-40