Merged 0.96p ( commit# 39ce801 ) into the English version