Merge pull request #1 from colour-science/code_style