merge check
merging
commit from federico
Merge branch 'federico'

Conflicts:
	README.rdoc

manually merged the two as I want because I can do it !
remove line in readme
Merge pull request #1 from fedetaglia/federico

Federico