Add logger class
fix logger, add logger call
Merge branch 'logger'