Merge pull request #3 from marcotesta/testbranch

Testbranch
commit su trunk
Merge branch 'master' into testbranch

Conflicts:
	README.md