Merge pull request #140 from pranavparikh/master

Fixing test
Merge remote-tracking branch 'upstream/master'