Updating shared repo
Merge pull request #332 from khawkins/unstable20

Updating shared repo