Lergo 79

Merging branch lergo 79