final refactor
Merge branch 'dep-types'
Merge branch 'master' into gh-pages