updaing logger
More logging updates
Merge branch 'master' into production