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