Fix #3
Merge branch 'develop'