AVANCES 23/FEB/2014
Merge branch 'master' of https://github.com/psigelo/NEAT
UPDATE TO 23/feb/2014