fixing inheritance, adding missing implementation of proxy
Merge branch 'master' of github.com:commit-to/Potato