Merge pull request #1 from seb86/master

1.0.2
Merge pull request #2 from seb86/dev

Merge pull request #1 from seb86/master