Commit message
Merge pull request #1 from dhardiman/feature/a-feature

Commit message