Merge pull request #475 from ovdeathiam/patch-1