Deprecated terms have been replaced.

Merged Raul Garcia-Castro requested to merge issue-4 into develop-v2.1.1

Closes #4 (closed)

Merge request reports