Manually merging PR #2
Merge branch 'stephenwelsh-master'