MAD Merge pull request #4 from nhoizey/patch-1