I made 2 chnages
Merge pull request #11 from kcwkwan/master

Pull request kcwkwan