Make event sharing more robust - Helps Fix #142
Fix indent
Fix indent, please
Merge pull request #155 from Gomez/stable5

More robust event sharing - fixes 142