updated according to review comments
code style change
Merge pull request #2 from gictor/master

updated according to review comments