Feature/mgamboa/2014 10 03/customize