Merge pull request #4 from krazdax5/master

forgotten merge
Merge pull request #5 from krazdax5/modifMenu_charles

Merge pull request #4 from krazdax5/master