Fix #37
Fix #39
Merge branch 'develop'