Merge pull request #409 from Alkarex/patch-1