- code review
Merge pull request #18 from ARACOOOL/master

- code review