new branch for logging functionality
Merge branch 'master' into logger
logging works now