Merge pull request #54 from taschetto/master

Merge pull request #2 from fator7/master