Final update of version 1.0