Merge pull request #747 from aboks/patch-1