* log format
* merge 'dev' branch