Remerge
Merge pull request #1 from Feinte75/Lot2

Remerge