Merge pull request #103 from l2dy/patch-1