Victor Algarin 12/06/2014
Merge origin/master