Merge pull request #7 from Tneconni/master

Merge pull request #7 from Tneconni/master