Refactor start
Merge pull request #4 from faceair/dev

Refactor start