Fix #67
Merge branch 'bugs'