v2.0.0
Merge pull request #23 from aleitner/master

v2.0.0