Merge pull request #1 from SqueeG/master

Did this backwards, disregard D:
Would get rid of it on my own, but apparently don't have that permission.