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