Johans' edits part 1
Merge branch 'master' of https://github.com/Zucka/MOM