Implemented fix to save and output data for the functions
Merge branch 'develop' into 1.0