oops, forgot this.
Merge pull request #7 from dominictarr/master

oops, forgot this.