Victor Algarin 05/08/2014
Merge origin/master