Merge pull request #536 from Vincent--/patch-1