Merge branch 'develop'
add error log