Refactor
Merge pull request #10 from nf1213/master

Refactor