Fixed and more additions
Merge branch 'master' of https://github.com/qbanguy/cruisetiki