fixed iss33
Merge pull request #40 from uWaterloo/iss39

Closes #39