Merge pull request #2 from nrleuenb/master

Trying again... and again... and again
Merge pull request #5 from nrleuenb/NRLeuenb

Merge pull request #2 from nrleuenb/master