Fix #54
Merge branch 'develop'