Merge pull request #51 from tamird/master

Add Rubocop and use RSpec expect syntax