Custom proxy type & annotations update
proxy type
annotation fix
Merge remote-tracking branch 'origin/master'
Merge pull request #4 from massanchik/master

ProxyType feature