Fixes #33, #51
Merge branch 'development' of https://github.com/ClevelandOnRails/rubyonrailsbook into development