Merge pull request #2 from krazdax5/master

forgotten merge
Merge pull request #3 from krazdax5/classerFormes_Charles

Merge pull request #2 from krazdax5/master