Ortographic errors corrected and little refactor.
Merge pull request #33 from hmourit/master

Ortographic errors corrected and little refactor.