Victor Algarin 14/04/2014
Victor Algarin 14/04/2014
Merge origin/master