some fixes with responses
Merge branch 'master' of github.com:gyzerok/UPG