Merge pull request #1 from craSH/master

A few fixes and enhancements
Update in Changelog of security finding by craSH