Edit Q6
Merge branch 'master' of http://github.com/stianwe/ttm4135