Merge pull request #5 from banqhsia/master

code beautify by banqhsia