added empar
Merge branch 'windowsexe' into stable