Development

Merge version 0.9.8 into master