Working build, branch from this
Merge branch 'master' of https://github.com/bhuberDADIU/DADIU-Team-2