Fix zombie
Working on #211
Fix #218
Fix #219
Fix #220
Prepare for v0.4.0 release