add to s method to export values
Merge branch 'feature-export_values' into develop