Merge pull request #165 from pranavparikh/master

Fixing demo tests
Preparing for v 90
Merge remote-tracking branch 'upstream/master'