...
Merge pull request #4 from haizhixing126/finalfix

...