Merge pull request #1 from matteobaglini/master

First public version