Fixed analysis tools
Merge