bug fixes + proxy impl
Merge remote-tracking branch 'origin/master'