Merge pull request #125 from oxylusengine/rmlui_surface