Reconfig v3.1
Merge branch 'master' of https://github.com/joseramonc/FMAT-framework