pulling latest commits
Nicola|fixed merge conflict