Improvements in logging. Added Demo class.