Bind ISO8601Dates
refactor, step1
Merge pull request #1 from jto/refactor

Refactor