Fix #1
Fix #11
Merge branch 'canari'