Victor Algarin 1/2/2014
Merge origin/master
Victor Algarin 2/2/2014
Victor Algarin 2/2/2014