Victor Algarin 28/02/2014
Merge origin/master