Refs #8. Adding stuff for CNCS geometry and making new one.
Merge pull request #9 from mareuter/master

Refs #8. Adding stuff for CNCS geometry and making new one. See comment above about #10.