Merge pull request #890 from luckyraul/patch-1