More stuff.
Merge branch 'master' of https://github.com/ninja-coding/dis-is-a-test