join types as well
Merge branch 'master' of github.com:wuan/klima