MRC's edits
Merge pull request #5 from mr-c/master

MRC's edits