-> toggle button for log implemented
Merge origin/master