Improved livelog
Merge origin/master