testing
Merge pull request #1 from simoneduval/master

Merging Simone's work.