add error token jump!
Merge branch 'master' of ssh://github.com/Determinant/piztor