Merge pull request #13 from lilweirdward/master

stuff