Merge pull request #204 from khawkins/unstable20

Merging unstable into unstable20