Merge pull request #1 from nonsensery/some-stuff

Did some stuff
Merge branch 'master' into more-stuff