Add support for format control
Merge branch 'master' of github.com:jagipson/FSEterm