work on GUI
Merge remote-tracking branch 'taillefer/master'
Merge remote-tracking branch 'taillefer/master'
Merge remote-tracking branch 'taillefer/master'
Merge remote-tracking branch 'origin'
fix another typo