Update to 2.1
Merge pull request #19 from geetarista/v2.1

Update to 2.1