Fixed infinite recursion
Merge pull request #246 from korczis/rest-merge

Fixed infinite recursion