Merge pull request #866 from yasoob/master