Final update

Final version: 10/01/2014