major refactoring in process
Merge branch 'master' of https://github.com/Enremmeta/Lot49