Victor Algarin 13/06/2014
Merge origin/master