Merge pull request #32 from chuyu123/master

1024  冲突啊~~~~(>_<)~~~~
lazy temp
Merge pull request #6 from piercalex/master

1027joe部分提交