merged commit 4c96391 from kidwm repository