Merge pull request #136 from zelgerj/master

added logger feature
fixed tests