improved event handling
Merge branch 'dev' of github.com:lintubongarit/sulka into dev