Changes made by Bernat Martinez Vidal (bernatmv@gmail.com).