merge
Merge branch 'master' of github.com:phgamper/phgamper.ch
Merge branch 'master' of github.com:phgamper/phgamper.ch
spell correction