Merge pull request #1036 from yasoob/master