code review
Merge pull request #27 from ARACOOOL/master

code review