Merge pull request #4 from kvonflotow/dev

0.0.5