ha i cheated :P
Merge pull request #701 from Gravecorp/master

ha i cheated :P