initial commit
typo fix
Merge pull request #1 from tsamb/Richard

Richard
fix merge conflicts