Added Logger and comments
Merge branch 'Logger'