Initial code
Merge pull request #1 from chris-martin/initial-code

Initial code