ping pong: fixed n2 slowness
Merge branch 'master' of github.com:peterklipfel/automashup