Bug fix :)
Merge branch 'master' of https://github.com/MarineAPI/MarineStandalone