Bugfixing Lucas
Merge branch 'Lucas'