Code looks good. I ran some tests on my end and did not run into the NULL test suite issue that Dean ran into. I'm guessing Dean ran into an error changing up the code because the patch file wouldn't apply.
Reviewed-by: Nicholas Pratte <npra...@iol.unh.edu> Tested-by: Nicholas Pratte <npra...@iol.unh.edu>
