Minor updates
Release 0.9e
Merge branch 'master'