Merge pull request #586 from hcavarsan/fix-stop-proxy