Setting up health
Merge pull request #388 from ping19/master

Setting up health