Adapts to new Completion API
Merge pull request #234 from skyluc/issue/API-Completion

Adapts to new Completion API