Merge of fix for #92 from branch 2.0
corrected changelog