Change from a feature branch.
Merge pull request #1 from ecopony/feature

Big change landing!