Merge pull request #131 from alucard62/master

Corrections/Améliorations
Merge remote-tracking branch 'upstream/master'