Merge pull request #4 from rocky1138/patch-1