check handler modified, tests for it
Merge branch 'master' of github.com:mwaylabs/TMP2