Current changes & fixes
Merge branch 'master' of github.com:vzrus/VZF