Mergefix
Merge branch 'master' of github.com:hostyle/alabaster-darkness