Tidying up
Merge branch 'Optickle2' into Optickle2-jm