Merge pull request #41 from tbroyer/install-proxy-first