Add Cleanup and Only
Merge branch 'master' of github.com:vektra/neko