Merge pull request #45 from where2night/develop

Develop
close #23 delete events
Merge pull request #46 from where2night/Adrian

Adrian