Update to 2.1
Merge pull request #559 from owdqa/feature/dialer2.1

Update to 2.1