Fix #4.  Better Proxy samples.

Borrowed from http://1drv.ms/No2Fl4.