Added mbeelen
Merge branch 'master' of https://github.com/mbeelen/quango