Revert "commit"

This reverts commit d43218e713c3ef62e7033f0f3373cbe88f2c8bfb.
Revert "Revert "commit""

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

* 'master' of https://github.com/at0g/calcium:
  Revert "Revert "commit""
  Revert "commit"