v2.0
Merge pull request #1 from kimtimotius/master

v2.0