Fix rubocop issues
Merge pull request #266 from korczis/rest-merge

Fix rubocop issues