Test after merge.
Version: 1.0.21
Entry: mfontana (04/10/2014)
Merge branch a master y direccion github en CREDITS