Fixed usage of log
Merge branch 'dev'