Added CCK option to the list of required fields
Merge pull request #115 from carcam/master

Getting rid of comments at the beginning of the file
Merge pull request #113 from carcam/devel

Added CCK option to the list of required fields and some indenting fixes