Rspec 2 14 1

The commits needed are the last 2 commits:
7b8c904 and d4a3ffd