Merge pull request #1367 from am11/master

Code: Fixes method name
Code: Analysis fixes and formatting.