spectrafit

2df7dd87 - Merge remote-tracking branch 'Spectrafit-GitHub/develop' into develop