Updated by coolAlias, see notes

This will have errors until I add the correct methods to CommonProxy
Merge pull request #1 from coolAlias/patch-1

Updated by coolAlias, see notes