Merge pull request #103 from NiteshKant/master

Fixes issue #90 #100
Merge pull request #104 from NiteshKant/master

Another attempt at fixing a flaky test.
Merge pull request #107 from NiteshKant/master

Fix build failure