Merge pull request #725 from timeu/patch-2