Merge branch 'release/0.4.0'
Merge branch 'release/0.4.1'
Merge branch 'develop'
Update README.rst