Updates to Logger.cpp and Logger.h based on work with Nick Evans.