Fixing warning from rspec
Including changes from #103 with tests
Merge pull request #104 from thotmx/master

Fixing rspec syntax warnings and fixing #103 with tests