Fixes issue 429
Merge pull request #518 from petele/patch-1

Fixes issue 425