Changelog + readme 1.1.8
Merge branch 'master' into 1.2