Add dynamic attr_accessor
Refactor
Merge branch to master