refactor for rspec 3
Merge pull request #129 from spaungam/rspec3

Refactor for rspec 3