Victor Algarin 26/03/2014
Victor Algarin 26/03/2014
Merge origin/master