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

Fix rubocop issues