small adjustments after 2hrs on a not-pushed ticket system
XMerge branch 'master' of https://github.com/Curcolio/Intra42