Merge pull request #15 from lilweirdward/master

stuff