Support for extra options
Merge branch 'master' of github.com:webdetails/cdf