Next release number
Add proper event handling
Merge branch 'developer'