Merge pull request #7 from lilweirdward/master

stuff