Merge pull request #1 from brtz/next

[RELEASE] 1.0.0
Merge pull request #4 from brtz/next

[RELEASE] 1.0.1
Merge pull request #5 from brtz/master

Master