Merge pull request #61 from liaoxuezhi/dev-refactor

Dev refactor