Fixed logging issues
Merge pull request #17 from bkfunk/master

Fixed logging issues