#77 - Lots of changes
Merge branch 'MEANS'