Merge from development into master

Added some more functionality for the logger.