Merge master.
Merge pull request #2 from lcostantini/master

Merge master.