Some corrections and comments
Merge pull request #1 from patmorin/master

Corrections and comments