some additions
Merge github.com:co0p/codekata