Updated with extra functions
Merge branch 'master' of https://github.com/CThuleHansen/TIPLPA_MultiParadigm