initialized String property
Added Edit command in OOP
Merge remote-tracking branch 'origin/yongkai'