Update for API v2 support
Merge pull request #20 from Plain-Solutions/dev

2.1.1/2.1.4