Merge branch 'kbase'
Merge branch 'master' of github.com:levinas/assembly