Merge pull request #1 from seb86/dev

v1.0.0
Merge pull request #2 from seb86/master

Merge pull request #1 from seb86/dev