Changes with logging, changes in UI
Bug fixed
Merge remote-tracking branch 'origin/pele' into mazanuj