Merge pull request #1231 from yasoob/master