Added rspec tests and fixed two bugs
Merge pull request #13 from MarconiVini/master

Added rspec tests and fixed two bugs