commit message
Merge pull request #1 from SMcCalden/stephen

commit message