Feature two
Merge pull request #1 from smeade/2-feature

Feature two