Revert "Chris"
Merge pull request #18 from griffint/revert-17-Chris

Revert "Chris"