Victor Algarin 08/05/2014
Merge origin/master