Fix #43
Merge branch 'develop'