Build: #22 failed Changes by Takeshi Nakazato and Ville Suoranta

Code commits

Casa6