Merge pull request #5 from rocky1138/patch-2