Merge branch 'unstable'
Fix example in README
Merge branch 'master' into unstable