Merge pull request #301 from nmav/ocserv4