Made to work with logger
Fixing merge prblm
Merge pull request #2 from cptmashek/master

Yay!