Fix
Merge pull request #275 from korczis/rest-merge

Fix