Merge pull request #40 from where2night/develop

Develop
close #22 close #41 close #43
new merge events