Fix bugs
Merge branch 'master' into bugfix/healthcheck
Merge branch bugfix/healthcheck
Merge pull request #40 from housegevity/bugfix/healthcheck

Bugfix/healthcheck