referencing the diss of tao
Merge branch 'master' of https://github.com/boschthomas/work