Merge pull request #878 from yasoob/master