Victor Algarin 23/05/2014
Merge origin/master