Merge pull request #1644 from ztone/eval_class_attr