Merge pull request #1 from seb86/dev

v1.0.1