doowb Merge pull request #30 from Primigenus/patch-2