error fix width/height
Merge branch 'master' of github.com:zian92/msws12