canon implemented
Merge branch 'master' of github.com:melhuang/tambourine