Fixed the startup success message being in the main class.
Merge remote-tracking branch 'origin/master'