Victor Algarin 26/06/2014
Merge origin/master