Added state object to state handlers
Merge branch 'master' of github.com:jillix/layout