mrkhdly Merge pull request #696 from m90/patch-1