Adds canary support
Merge pull request #4 from willdurand/canary

Adds canary support