merge SF parser [master]; create class T for type; update TParser