Adding Roger & Greg's code
Merge pull request #1 from Masseyd/rjaffe_gsmcwhirter

Adding Roger & Greg's code