Added Canary support (closes #5)