V0.9

Merge v0.9 and v0.10 changes into the master branch. Testing is over!