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

- code review