refactor and fix
fix errors
Merge pull request #5 from justmao945/devel

Devel