Fix #47
Merge branch 'develop'