Fixed rubocop issues
Merge pull request #260 from korczis/rest-merge

Fixed rubocop issues