Fix cs #79
Update changelog #79