Merge pull request #3 from colour-science/code_style