Refactor
Add test file
Refactor and fixbug
Fix error for gulp