Add defined? for @ivars
Merge remote-tracking branch 'origin/defined-ivars'