Merge pull request #38 from Pyrdacor/master

Cleaned up the logger code