Made compatible with CD 1.5
Merge pull request #1 from joelworsham/master

Made compatible with CD 1.5