Update main.cpp and main.h
Merge remote-tracking branch 'origin/master'