Ops...
Merge pull request #2 from castagna/master

Oops...