Merge pull request #66 from liaoxuezhi/dev-refactor

已修复之前提的问题。请再review