Add support for expand.
Fix encoder, add a couple tests.
Merge pull request #32 from stripe/expand

Add support for expand.