Second pull request with 93% spec coverage.