Revert "Revert "commit""

This reverts commit 1ff9d5f38c69318451ac8559d2eee4c888e2faf3.
Merge branch 'master' of https://github.com/at0g/calcium

# By Ben Daley (1) and haydn paterson (1)
* 'master' of https://github.com/at0g/calcium:
  Revert "commit"
  commit