Refactor the code
Merge pull request #33 from ainilife/master

Refactor the code