Small changes
Merge branch '2.0' of https://github.com/jensstigaard/dtulan.git into 2.0