Issue #420
Merge pull request #424 from Blaimi/master

Issue #420