Victor Algarin 03/04/2014
Merge origin/master
Victor Algarin 07/04/2014