Panel class fix
merge master