General update

0.9 is still the most recent version, so get the changes made in that branch into the master branch.