Merge pull request #498 from glebm/patch-1