Merge pull request #477 from RedBrogdon/healthchecks