Add Jubi Taneja (individual CLA)
Merge pull request #36 from regehr/master

Updated version of Jubi's patch