Some changes.
Merge pull request #4 from enricosciacca/modify

Some changes.