updated mapping
Merge branch 'master' of https://github.com/kylejao/ocean_framework
bug fixed, remake options menu