Work on Build
Merge branch 'master' of https://github.com/robert-schi/MaxMohr_DieHeidin