Updates from Session with Amanda
Merge branch 'master' of https://github.com/benschultz/FWSuite
CFG change