Ultima version revisada completamente
VERSION CANDIDATA
Merge branch 'master' of github.com:dravix/tpc