Victor Algarin 29/07/2014
Merge origin/master