Merge pull request #324 from am11/master

Analysis: Various CA fixes and code cleanup
Performance improvements
Performance improvements
Merge pull request #328 from am11/master

Code: Minor improvement
Breaks the loop
Analysis: Removed unused field.