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

- code review