Changes for merge with biancini code
some files changed for merge