Fix #7
Merge branch 'master' into null-object
Fix remaining RSpec3-incompatible specs