Logger cleanup
Merge pull request #66 from eprogramming/master

Logger cleanup