RSpec 3 compatible
Merge pull request #4 from johnae/master

RSpec 3 compatible