Fix tests on ruby 1.9.3
Merge remote-tracking branch 'remotes/origin/pr/5' into add-attributes