Fixing rubocop issues.
Merge pull request #338 from nstielau/rubocop_fixes

Fixing rubocop issues.