fix for GitHub issue #30
Merge branch 'master' into feature/colour_model
More work on a well-defined colour model.

Modified the colour class templates to be palatable for g++.