modernize
Merge branch 'dev' of https://github.com/toolkitchen/toolkit into dev