Victor Algarin 27/03/2014
Merge origin/master
Victor Algarin 31/03/2014