Typo and Format Fixes
Merge pull request #965
Merge pull request #965 in develop