Cleanup + zombie bug fix
Version History 2013-03-15