Merge branches 'master' and 'wip'
Merge branches 'master' and 'wip'
master to hold releasable versions
update README
Merge branches 'master' and 'wip' into wip