Victor Algarin 17/03/2014
Merge origin/master
Victor Algarin 17/03/2014
Merge origin/master