Fix #253
Merge branch 'dev'
Fix #237