RSpec 3

Fixes #11
Fixes #12