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

- code review