More work on proxy function, added proxy test case
Merge remote-tracking branch 'origin/master'