Fix botched merge so Analysis works
Merge pull request #30 from kyruscharities/fix-botched-analysis

Fix botched merge so Analysis works