Merge pull request #304 from guidosarducci/master-siproxd-update