Solve issue #54.
Merge branch 'feature/54-phys-fidelity' into develop