Updates to EPA1
Merge branch 'master' of https://github.com/aaltodsg/instans