Merge branch 'base-interface'
Merge branch 'master' of https://github.com/adennie/otto