Version 0.9.0
Merge remote-tracking branch 'origin/master'
Fix regressions introduced by #97