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

- code review