add comment
slash error log as false
Merge remote-tracking branch 'origin/master'