Victor Algarin 14/05/2014
Merge origin/master