Merge pull request #438 from Y0ba/master

Очередная оптимизация
Version update
Fix pviews expanding