doowb Merge pull request #4 from tibbon/patch-1