Merge pull request #372 from fantasticfears/patch-1