Minor updates
Conflict solved
Merge branch 'master' of https://github.com/Jens84/dmup