Merge pull request #4 from trs998/patch-1