Minor edit
Merge branch 'Antares95-master'