Merge pull request #3 from tkistner/master

bleh