Merge pull request #125 from JCook21/master

Updated to use Rspec 3.1