Merge pull request #2 from nrleuenb/master

Trying again... and again... and again