Victor Algarin 16/01/2014
Merge origin/master