support toktei as well as mbtei
Merge branch 'master' of github.com:CIIR/Proteus