Merge pull request #915 from 0xflotus/patch-1