Fix #255 and add entry into the ChangeLog file