Merge pull request #6 from PawanHegde/master
corrected a merge mistake in CHANGELOG
Merge remote-tracking branch 'upstream/master'