Version 2.6.1 and update CHANGELOG