updated CHANGELOG.
Merge branch 'faunus03'