Merge pull request #5 from iamjohnli/master

change