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

- code review