few changes - variables put in property location
Merge remote-tracking branch 'origin/master4' into master4
fixed code slightly