Use event log machine

Use non static version for EventLog, which are taking the machine name
into account. fixes #170
Merge branch 'v2maintenance'