Bugs 4 and others
Merge branch 'master' of https://github.com/KernelCorp/karat