Fixed stuff
Merge branch 'master' of https://github.com/jonashalland/KTN2

Merge