Rebuild fix more!
Merge branch 'ReBuild' of https://github.com/malla/TDA367 into ReBuild