Merge pull request #906 from obazoud/patch-1