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

- code review