Merge remote-tracking branch 'upstream/unit-tests'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix for IndexError
Merge pull request #184 from vnitinv/normalize-space-fix

Normalize space fix