avz fix for new n2o
Merge branch 'master' of git://github.com/synrc/avz