Merge pull request #745 from alishir/patch-1