Some old changes found lying around
Merge pull request #2 from JonnyFunFun/orphaned-changes

Some old changes found lying around