Victor Algarin 21/02/2014
Victor Algarin 21/02/2014
Merge origin/master