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

- code review