Merge pull request #20 from twied/master

Again, pick what you like