complete rest-api
Merge branch 'fix-callback' into update-rest-api
complete rest-api
Merge remote-tracking branch 'upstream/master' into update-rest-api
Merge pull request #30 from maboiteaspam/update-rest-api

Update rest api