small changes
Merge branch 'andreas' into mikkel
Merge branch 'mikkel' into andreas