added be_welcome option
Merge branch 'master' into develop
Future Trips:
now displaying a map
fixed taiwan issue