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

- code review