Alessio and Anne-Lyse additions
Merged
Merge pull request #1 from ziorufus/naf

Modifications made in FBK