Update for upstream version 1.5.1
Merge pull request #5 from Magrath/master

Update for upstream version 1.5.1