(refactor) Updated for iron's flattening.
Merge pull request #24 from iron/refactor/iron-flattening

(refactor) Updated for iron's flattening.