Merge pull request #85 from rsahlberg/remove-zhr.h-dependency