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

- code review