Merge pull request #83 from gpbenton/obj_not_defined_fix