Merge pull request #1 from alexwpotter/master

Let's merge this F#!%cker