Experimenting.
Merge branch 'master' into marco
Needs studying
Merge pull request #2 from mcanini/marco

Merge experimentation from Marco