Merge pull request #6 from benwaffle/master

various stuff