Merge pull request #5 from lilweirdward/master

Stuff