Merge pull request #411 from Alkarex/patch-2