- updated to original version 2.3 of Marco Renzi 2011-05-03