Fix #224 , fix #225
Merge branch 'master' of https://github.com/Open-Code-Developers/BoatCraft