Build: #106 failed Changes by Kumar Golap and Akeem Wells

Code commits

Casa6