Merging in fdlimits branch. Fixes Issue #42.