Merge pull request #13 from CalvertYang/master

fixed format
fixed code