PATCH: brought over bug fix from nakul
Merge pull request #11 from UFParLab/BUGPATCH-375a525

PATCH: brought over bug fix from nakul