Victor Algarin 06/06/2014
Merge origin/master