Merge branch 'devel-aldo' into devel-dario

Conflicts:
	Makefile.am
	configure.ac
Small fix