commit message here
Merge pull request #4 from SMcCalden/stephen

commit message here