update CHANGELOG and Fixes #2