Merge "Added framework for logging"