Felipe Triviño 26-05-2014
Merge origin/master