Replaced keyword arguments with an options Hash
Merge pull request #4 from britishtea/master

Ruby 1.9 compatibility