Refactored3
Refactored4
Merge pull request #4 from yaoxiangg/4

4