sebastian student aut fixed
Merge branch 'sebastian' into dev