Merge pull request #37 from SvinSimpe/network_event_feat

Network event feat
Merge branch 'development' into network_event_feat