Fixes and adds to @fergunet

References #6
Merge branch 'master' of github.com:geneura-papers/2015-Evostar