Replaced wrappers with template magic.
Merge branch 'master' of https://github.com/mvirkkunen/purple-line