add new properties
Merge branch 'master' of github.com:OTSAAN/Ep
merge
Merge branch 'master' of github.com:OTSAAN/Ep
merge branch
test