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

- code review