Fix #65
Merge branch 'bugs'