Use Ruby 2.0 keyword arguments instead of opthashes