Rcruz/active proxy

Closes #153