code review
Merge pull request #28 from ARACOOOL/master

code review