adding changes from server
Merge branch 'master' of https://github.com/ragezor/TPO
Merge branch 'master' of https://github.com/ragezor/TPO