Merge pull request #22 from gkop/master

Tests pass against Ruby 2.0.0