Make changes
Merge pull request #1 from orossini/test

Make changes