small changes
Merge branch 'mikkel' into andreas