Merge pull request #5 from szeke/development

merging with development
Merge branch 'development'
Merge branch 'development'
Publish events model
Merge branch 'master' into development