Fix some up can-can
Merge pull request #4 from bmneely/fix-can-can

Fix some up can-can