Merge branch 'Feature-Weibull'