add flush()
add date2()
fix Log
Merge branch 'develop'