20140218 update according latest version from Matteo, clean old CVS tags