Develop marc

Refined evaluation code.

added 26 commits

• 122d1888...e0159e87 - 25 commits from branch master
• 8672ebf9 - Merge branch 'master' into 'develop_marc'

Compare with previous version

merged

mentioned in commit 972891f4

Finished merge request. Fixed some of the comments in issue #9 (closed)