Aligned API with latest implementation fixes.

Jira-issue: API-26
Merge pull request #10 from fabianatwork/API-26-App2App-Implementation-Align

Aligned API with latest implementation fixes.