Add template support
Merge branch 'master' of https://github.com/looly/comuker