Addition of Christos Oikonomou
Necessary changes in chrikon.xml
Correction in an expression
Merge branch 'master' of https://github.com/istlab/web