More on adding data fields, breaking up long part
Merge branch 'master' of https://github.com/DASISH/TERESAH