fixed settings for 1.4
Merge branch 'master' of github.com:nnrcschmdt/helsinki