Fix #82 and #81
Merge branch 'develop'