amend Welcome message
amend return type for some functions
Merge branch 'master' into export