Merge pull request #1 from kakaly/master

TDD Rspec changes