Merge pull request #1 from Locu/master

Pull from upstream
Fix imports on aggregates analysis
Update stream_inspector.py
Merge pull request #105 from sbisker/master

Fix imports on aggregates analysis