Small changes to h1, and messing with code options
Merge pull request #20 from mr-mr/ccbranch

Small changes to h1, and messing with code options