Bugfix/completed healthcheck

* Fixes #43 
* Fixes #44