Support for EMWZ
Merge branch 'stable'