Merge pull request #22 from infirit/1.6

Cherrypick usefull commits from master
Add dist-hook for ChangeLog
Bump version to 1.6.1