kompletterings commit
Merge branch 'master' of https://github.com/laht/1DV449_jj222kc