updating from sf-docs 10/11/12
Merge pull request #198 from gregquat/master

updating from sf-docs 10/11/12