Merge pull request #4 from kvonflotow/dev

0.0.5
Merge pull request #5 from kvonflotow/master

Merge pull request #4 from kvonflotow/dev