from pprules
Merge pull request #22 from marqh/stfcrework

from pprules