Merge pull request #437 from codler/patch-2