fix bug with handler set on finish
Merge branch 'master' of github.com:5HT/n2o