mako in caps
Merge branch 'master' into 0.1.0

* master:
  mako in caps