Victor Algarin 24/04/2014
Merge origin/master