Merge pull request #11 from lilweirdward/master

stuff