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