update rubocop and fix some errors
Merge pull request #142 from CruGlobal/updated-rubocop

update rubocop and fix some errors