updated README
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into 0.4.0-wip