@bookis variable checking
Merge branch 'master' into rspec-twitter2