updating from sf-docs 13/11/12
Merge pull request #204 from skeud/master

updating from sf-docs 13/11/12