Rewriting patch with html wx and merge to master