Merge pull request #2 from panatta/master

Merge pull request #1 from panatta/1.0.0