Merge pull request #37 from Namasteh/devel

6.4 Version update
Updated CHANGELOG after version release
Fixing merge
Merge branch 'devel'
Changed CHANGELOG
Changed CHANGELOG for version 6.5 release