Merge pull request #187 from Noahhh/master

A tiny bit of rspec and merging
few formatting changes