added logger
Merge pull request #1 from quipo/master

Rebase with upstream master