Build: #192 failed Changes by George Moellenbrock and Hendrik Muller

Code commits

Casa6