FInal fix for stack overflow, hopefully
Merge pull request #198 from Healthire/release/1.2.1

FInal fix for stack overflow, hopefully