kap 6.4 + 6.6
fixed merge conflicts ;)
Merge branch 'master' of https://github.com/skjoenberg/DIS2