Performance issued fixed, reopens #25
Merge branch 'master' of github.com:nixolas1/zoff