fix property issue
added comment
Merge branch 'test' into test1