Fix #64
Merge branch 'develop'