Some changes

This file contains some changes
Merge pull request #1 from jsubirats/master

Some changes DONE