Even more contour adjustments...
Merge pull request #5 from bwgref/master

Even more contour adjustments...