Adding changes to support the US.
Modifications for what appears to be a new format since the original gem was created.