Fixed CBC
Merge pull request #28 from KenMacD/master

Fixed CBC, closes #27