Build: #105 failed Changes by Takeshi Nakazato and Akeem Wells

Code commits

Casa6