Feature/mgamboa/2014 10 20/finals