Had some minor changes, merging
Merged stuff
Added k2045 dictionary