Merge pull request #1 from mattwith/master

Looks good!