add functions to main method
add output messages in main.cpp
Merge branch 'master' into dev
hot fix on master branch