RSpec build conflict with Ruby build resolved
Merge pull request #40 from osrocha/master

RSpec build conflict with Ruby build resolved, close #22