2branchLuca
3branchLuca
merging done without exceptions