Merge pull request #20 from jontsai/master

a bunch of stuff