added w2
Merge branch 'master' of https://github.com/MediaSystems/avprg