Fix #36
Merge branch 'develop'