making rspec tests pass
merging github changes