Merge pull request #7 from dbeck/master

first big pack of logger changes
Merge remote-tracking branch 'upstream/master'