Merge pull request #2 from colour-science/code_style