Bug de lang
Merge branch 'Samuel'