Fix #41
Fix #42
Fix #42
Merge branch 'develop'