Merge pull request #5 from panatta/1.0.0

Merge pull request #4 from panatta/master
Merge pull request #6 from panatta/master

Merge pull request #5 from panatta/1.0.0