last changes for final release 1.2