Adaptation to new dedicated-api
Merge pull request #1 from NewboO/master

Adaptation to new dedicated-api