Made compatible with CD 1.5. Also changed some things.
Merge pull request #1 from joelworsham/master

Made compatible with CD 1.5. Also changed some things.