re commit
apply last changes of glaiza