Build: #213 failed Changes by Pedro Salas and Akeem Wells

Code commits

Casa6