Fix CanaryLib/#1 ticket.
Merge pull request #2 from greatman/master

Addition to CanaryLib/#4