Merge pull request #6 from weexteam/feature-refactoring

Feature refactoring