put logger
Merge branch 'dev'