fix comments
merge with master
Merge pull request #1 from ETNOL/master

fix comments