Corrected some typos
Merge branch 'Litschi-master' into development