Steve's comment added
Merged, Sroop's changes accepted, Steve's rejected