Merge pull request #110 from SwannCroiset/uchiwa-proxy

Uchiwa proxies