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