Fixing my last fix and rename area under the curve
Merge branch 'Area' into develop