Merge pull request #9 from TheBlueMatt/2021-03-cleanup-debug