Ooops? :)
moving some things around
Merge pull request #3 from CROMBi-kk/kk4.4

Merge into kk4.4