Last commit before merging with Tim's latest version of pysovo.