proofread version
including ram
Merge remote-tracking branch 'upstream/master'