Merge pull request #543 from BKPepe/ahcpd