Restore cpoptions
Merge pull request #17 from blackheaven/master

Restore cpoptions