Merge pull request #2 from fdaniele/master