Merge pull request #2 from rluders/master

Merge pull request #1 from rluders/develop
Merge pull request #3 from rluders/release/v0.0.1

Merge pull request #2 from rluders/master