Factored out Console Logging into a separate sub-class
Factored out Console Logging
Merge remote-tracking branch 'origin/develop' into develop