fixed conflict
updated the sample mapping file
fixed error from merge
Merge pull request #8 from mastoj/DynamicLogEvent

Dynamic log event