added attr_accessor
fixed merge