Hopefully doesn't cause bugs?
Merge branch 'master' of gh:zfogg/zfogg