fixed incorrect code for reading function file, added new functions
Merge branch 'master' of https://github.com/johnmgregoire/JCAPDataProcess