nsoranzo Merge pull request #1206 from stain/patch-1