fixed stuffs

Fixed properties and pic dodad
Merge remote-tracking branch 'origin/Alexander'
Merge remote-tracking branch 'origin/master' into Viktor