Reviewed the mainwindow.cpp and modified mainwindow.cpp and configurationform.cpp.
Merge pull request #155 from Bumanji/master

Minor changes on the mainwindow.cpp and configurationform.cpp