Merge pull request #105 from Lee2532/patch-1