added logs
Merge branch 'log' into dev