all methods/tests complete, changed rspec version
merged solo branch with master