Join the mapping to upload events (fixes #266)
Merge pull request #270 from K-Phoen/issue-266

Join the mapping to upload events (fixes #266)