Merge pull request #204 from pranavparikh/master

Fixing demo tests for import descriptor
Merge remote-tracking branch 'upstream/master'