Merge pull request #29 from fpaut/master

simplifying a small part of code
code cleaning
Fix typo