test
Event UI and Connection changes
Merge pull request #6 from matmat007/master

Merge with Mat's latest push