Merge pull request #2 from arioch/master

Missed a few, Jan
Add initial rspec coverage